schemadiff: better nil check validation
#15526
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Shlomi Noach <[email protected]>
Review ChecklistHello reviewers! 👋 Please follow this checklist when reviewing this Pull Request. General
Tests
Documentation
New flags
If a workflow is added or modified:
Backward compatibility
|
vitess-bot
bot
added
NeedsBackportReason
shlomi-noach
changed the title
schemadiff: better nil check validation
shlomi-noach
removed
NeedsDescriptionUpdate
rohit-nayak-ps
approved these changes
Mar 20, 2024
go/vt/schemadiff/diff.go
Outdated
| @@ -177,7 +177,7 @@ func DiffSchemas(env *Environment, schema1 *Schema, schema2 *Schema, hints *Diff | |||
|
|
|||
| // EntityDiffByStatement is a helper function that returns a simplified and incomplete EntityDiff based on the given SQL statement. | |||
| // It is useful for testing purposes as a quick mean to wrap a statement with a diff. | |||
| func EntityDiffByStatement(statement sqlparser.Statement) EntityDiff { | |||
| func EntityDiffByStatement(env *Environment, statement sqlparser.Statement) EntityDiff { | |||
There was a problem hiding this comment.
env doesn't appear to be actually used in this function?
There was a problem hiding this comment.
You're right. It was due to an earlier iteration. Now removed.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #15526 +/- ##
==========================================
- Coverage 65.71% 65.70% -0.01%
==========================================
Files 1560 1560
Lines 194484 194492 +8
==========================================
- Hits 127798 127790 -8
- Misses 66686 66702 +16 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Shlomi Noach <[email protected]>
mattlord
approved these changes
Mar 20, 2024
| @@ -214,9 +214,16 @@ func unifiedAnnotated(from *TextualAnnotations, to *TextualAnnotations) *Textual | |||
| // annotatedDiff returns the annotated representations of the from and to entities, and their unified representation. | |||
| func annotatedDiff(diff EntityDiff, entityAnnotations *TextualAnnotations) (from *TextualAnnotations, to *TextualAnnotations, unified *TextualAnnotations) { | |||
| fromEntity, toEntity := diff.Entities() | |||
| // Handle the infamous golang interface is not-nil but underlying object is: | |||
There was a problem hiding this comment.
TiL that an interface holding a nil value is not nil
There was a problem hiding this comment.
You're in for some fun times!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Quick followup to #15519, when further testing
annotations, we getnilreference errors. This is due to the ever unexpectedgolangbehavior of "interface is not nil but actual value is nil".This PR does better handling of
nilinterface values, and adds tests to validate.Related Issue(s)
#15519
Checklist
Deployment Notes